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