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