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