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