Merge changes I099c8315,I21e958d3 am: 6317dae7fb

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

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