Merge changes from topic "am-5a09988d50484da3931f193fe3b0f1f7" into tm-d1-dev-plus-aosp am: 5700e79c am: b362bb4a

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



Change-Id: Id8aa5ecb257ca8d79661c8ab653664c9f3f35d07
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>