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