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