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