Merge changes I9b6121a7,I31a47234 into udc-qpr-dev am: 322cab20

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



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