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

Merge changes from topic "am-f399541741b14cbaa7a92199ac7b346e" into tm-d1-dev-plus-aosp am: 86b5ac00 -s ours

am skip reason: Merged-In I7e83544863eeadf8272b6ff8a9bb8136d6466203 with SHA-1 02771b7f is already in history

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



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