Merge changes I3c1f0ebb,I6bf500c5,I86ff54f9,Ia2441b38 into tm-qpr-dev am:...

Merge changes I3c1f0ebb,I6bf500c5,I86ff54f9,Ia2441b38 into tm-qpr-dev am: 4626fa48 am: 0e9d655c am: 0dedd086

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



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