Merge \"wifi: allow config of default+verbose ring buffers\" into nyc-mr1-dev
am: 88442c1fe1

Change-Id: Ibd81afe406de02e46664e4cf846e0e2e50968603