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