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