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