Merge changes I5150d58a,If6c3edbf into tm-qpr-dev am: 56f76309 am: bef584ee

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



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