Merge changes Idc218e5f,I26c3fafc am: 7e3c5382cc

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

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