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