Merge changes from topic "presubmit-am-b3d24d2d5c464078a26daa35c449ad8e" into sc-qpr1-dev am: 3c59b90c0f am: 6ed0796839 am: e51c871947

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

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