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