Merge changes from topic "am-bef799ddf8b443e09450c0c28fa5d41f" into tm-d1-dev am: e48d398e

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



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