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