Merge "Merge changes I21aaab57,Ie174f7ec am: d5441ca5" into stage-aosp-master am: 4013a4f0

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



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