Merge "Merge "Remove @Nullable annotation for onConfigurationChanged." into...

Merge "Merge "Remove @Nullable annotation for onConfigurationChanged." into tm-qpr-dev am: 05fafde8" into tm-qpr-dev-plus-aosp am: 5c7030a9

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



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