Merge changes from topic "am-14bf5a3fba3143bdb2d095df4a013d3a" into...

Merge changes from topic "am-14bf5a3fba3143bdb2d095df4a013d3a" into tm-d1-dev-plus-aosp am: 24d242da am: 78c6ecc7

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



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