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