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