Merge changes from topic "am-98e92ea1e60d42c4abf8179e5406a73b" into udc-dev am: fddd8e8a

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



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