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