Merge changes Ia9d5b620,I49577bc7 into udc-qpr-dev am: c358f7fb

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



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