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