Merge "SystemUI: replace androidx.test.ext.junit with jsr305." into udc-dev