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