Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400 Change-Id: I6a6847b98fa774efc3d3977d50512e446beb38c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>