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