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