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