Merge changes Iefe84120,I482cce6d into udc-dev am: b7db507661 am: bf5dddca56

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

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