Merge changes I9311210f,Ic42cc810,I42781e8e into udc-d1-dev am: 7421288b2d

Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23700251

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