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