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