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