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