Merge changes I645115ab,I73b51987,Id1b79253 into tm-qpr-dev am: 2c34290e87 am: c52dcfa7d5

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

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