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