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