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