Merge changes from topic "am-197d7547c75c471a92ea5e0dcb59a884" into...

Merge changes from topic "am-197d7547c75c471a92ea5e0dcb59a884" into tm-d1-dev-plus-aosp am: 67d038b4

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



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