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

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

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



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