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