Merge "CTS fix: add missing feature flags for API 23" into marshmallow-cts-dev