Merge changes I1c8db490,I96539176 into tm-qpr-dev am: 3b5f927e am: e74b5581 am: 12ec92ef am: 784d79cb

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



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