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