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