Merge changes from topic "am-37f91336a8c44f648b31525d5f2b3a44" into...

Merge changes from topic "am-37f91336a8c44f648b31525d5f2b3a44" into tm-d1-dev-plus-aosp am: 428c88c7 am: 646b7742

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



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