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