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