Merge changes from topic "am-01ff9a9d19694be48bdbc69db1397dbd" into...

Merge changes from topic "am-01ff9a9d19694be48bdbc69db1397dbd" into tm-d1-dev-plus-aosp am: 1f0cdbda -s ours

am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b3 is already in history

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



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