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