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