Merge "Remove AutofillManagerClient after AutofillManager is finalized"

am: dd5384a4fe

Change-Id: If0b092c5e18005fb4b8c1fd8405f4d666c98de5a

diff --cc core/java/android/view/autofill/AutofillManager.java
Simple merge

diff --cc core/java/android/view/autofill/IAutoFillManager.aidl
Simple merge

diff --cc services/autofill/java/com/android/server/autofill/AutofillManagerService.java
Simple merge

diff --cc services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
index 3a3b570,5c63b90..993c65b
--- 1/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
--- 2/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
+++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
@@@ -505,9 -484,12 +511,13 @@@ final class AutofillManagerServiceImpl 
          }
  
          sendStateToClients(true);
+         if (mClients != null) {
+             mClients.kill();
+             mClients = null;
+         }
      }
  
 +    @NonNull
      CharSequence getServiceLabel() {
          return mInfo.getServiceInfo().loadLabel(mContext.getPackageManager());
      }