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