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