[conflict] Merge changes Ie810d37d,I6947e1f7 into tm-qpr-dev am: 33b10071 am: 9e708c99

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



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