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