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

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



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