Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
am: 4396612e11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044 Change-Id: Ia56bdb9a1f9d9acdc078e8068ca5585a68f6bb64 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: