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