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