Merge "vendor: Switch to AOSP themes stub package [1/2]" into typhoon-qpr2