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