Merge "Import intermediate-AndroidX Design Library from local Maven ZIP" into tm-dev