Merge changes from topic "am-bfc0f89ad1364c2eb68c831484dca5e5" into udc-dev am: fa30988b am: a79cb071

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



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