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