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