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