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