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

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



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