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