Merge changes I4c4d257e,I4cc4cc22 into udc-dev am: f6eab0c9de
am: 14ffc962b8
am: 50244c4f86
am: 804b4d6eb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121657 Change-Id: I1e2a92b7026912f14632b835af89d8a77cc51d15 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: