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