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