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