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