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