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