Merge changes Ifcde87f4,Ie0606e5d am: f2d204c793 am: 6411fd0015

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

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