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