Merge changes I21aaab57,Ie174f7ec am: d5441ca5c3 am: 5087a7e6bc

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

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