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