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

Change-Id: I1612391b1e509adfc28760a0033370b85f722616