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