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