Merge changes from topic "am-281b95629e834ebbad42eb88529e4ae3" into tm-dev-plus-aosp am: 6b5b5e46

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



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