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