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