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