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