Merge changes I21aaab57,Ie174f7ec am: d5441ca5 am: 5087a7e6 am: f86b2d09

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



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