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