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