Merge changes Ifcde87f4,Ie0606e5d am: f2d204c793

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

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