Merge changes from topic "am-e7d4389ef3ef43ae9be71a000cf7211c" into tm-dev am: fd01ec15

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



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