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