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