Merge changes I413ec5ed,Id667768c into udc-dev-plus-aosp am: 9188533940

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

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