Merge changes I26c7d64e,I7ec6d824 into udc-dev am: 1c47f309af
am: 3feb199021
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22120466 Change-Id: I0cc20af23592faac2739f11c776112d0a3ff5dbe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: