Merge "Fix errorprone 2.15.0 errors" am: f9ae30fa6f am: 211af41853 am: e224114968

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2220922

Change-Id: Ia370f421a1b9336cd0a56007630fa5938206eb38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/java/android/preference/GenericInflater.java

@@ -406,7 +406,7 @@ abstract class GenericInflater<T, P extends GenericInflater.Parent> {
             InflateException ie = new InflateException(attrs
                     .getPositionDescription()
                     + ": Error inflating class "
-                    + constructor.getClass().getName());
+                    + constructor.getDeclaringClass().getName());
             ie.initCause(e);
             throw ie;
         }

services/core/java/com/android/server/am/ActivityManagerService.java

@@ -8786,6 +8786,7 @@ public class ActivityManagerService extends IActivityManager.Stub
      * @param incrementalMetrics metrics for apps installed on Incremental.
      * @param errorId a unique id to append to the dropbox headers.
      */
+    @SuppressWarnings("DoNotCall") // Ignore warning for synchronous to call to worker.run()
     public void addErrorToDropBox(String eventType,
             ProcessRecord process, String processName, String activityShortComponentName,
             String parentShortComponentName, ProcessRecord parentProcess,