Merge "Use RequireFeature instead of RequiresFeature" into stage-aosp-tm-ts-dev