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