Merge changes I2a8688e7,I6d831706 into tm-qpr-dev am: 558219ec am: bd3d8eda

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



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