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