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

Merge changes from topic "am-ec440d08f84746698d4b1d7e83015fb1" into tm-d1-dev-plus-aosp am: afd00cf6

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



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