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