Merge "[SystemUI] Implement a way to put satin_dev.apk into test assets" into tm-dev