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