Merge "Revert "Revert "Correct nullability and final constraints on new APIs."""

diff --cc api/current.txt
Simple merge

diff --cc api/system-current.txt
Simple merge

diff --cc telecomm/java/android/telecom/TelecomManager.java
index e655e4f,ce65cc1..84b2238
--- 1/telecomm/java/android/telecom/TelecomManager.java
--- 2/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@@ -832,9 -830,8 +835,9 @@@ public class TelecomManager 
       * @hide
       */
      @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
 +    @TestApi
      @SystemApi
-     public void setUserSelectedOutgoingPhoneAccount(PhoneAccountHandle accountHandle) {
+     public void setUserSelectedOutgoingPhoneAccount(@Nullable PhoneAccountHandle accountHandle) {
          try {
              if (isServiceConnected()) {
                  getTelecomService().setUserSelectedOutgoingPhoneAccount(accountHandle);