Merge changes from topic "am-3814f95bacde4982ab989e398ac8052d" into...

Merge changes from topic "am-3814f95bacde4982ab989e398ac8052d" into tm-d1-dev-plus-aosp am: da0a14a5 am: 31e7cf48

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



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