Merge changes from topics "ATT-UCE 430", "fix-uce-430" into tm-dev am: 455e490d

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



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