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