Merge "Deprecate methods on ActivityCompat, ContextCompat for future removal" into nyc-support-24.1-dev