Merge changes I099c8315,I21e958d3 am: 6317dae7fb am: dddfa2a3c5

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

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