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