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