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