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