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

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

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



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