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