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