Merge changes I5986ba47,I8ddeafe4,I385e2050,I1f8b2b4e,Iab75c65a, ... into tm-qpr-dev am: d756cb556d am: c94e56ebaa

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

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