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

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

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



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