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