Merge changes from topic "am-b2f392edf061412196627ca584b13a2c" into tm-dev am:...

Merge changes from topic "am-b2f392edf061412196627ca584b13a2c" into tm-dev am: 08a34d78 am: 46ca144b

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



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