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