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