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