Merge changes from topic "am-d860aeb1f4184ec4b358c442e876df1c" into...

Merge changes from topic "am-d860aeb1f4184ec4b358c442e876df1c" into tm-dev-plus-aosp am: ffab94b6 am: e1224ca4

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



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