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