Merge changes from topic "am-28d457cd546149c3b2acf232ddb9ed91" into tm-dev am: e1be2353 -s ours

am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 7d4ab9b6 is already in history

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



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