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

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



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