Merge "Address code warnings in the android.app package." am: a750dcaa am:...

Merge "Address code warnings in the android.app package." am: a750dcaa am: 34321c6d am: ccd04f87

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



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