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