Merge "Merge \\"Update CTS shims\\" into nyc-dev am: 6f140a249a am: f90ff6ef36" into nyc-mr1-dev-plus-aosp