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

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

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