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