Merge changes I21aaab57,Ie174f7ec am: d5441ca5c3

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

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