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