Merge changes I0feec96d,Id8eeac2b into udc-qpr-dev am: 0646b88fcb

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

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