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