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