Merge \"Add 24.1.0 api definition am: abf5fade20 am: cf06014e5c\" into nyc-mr1-dev-plus-aosp
am: 58d8c20725

Change-Id: I4359951ef2b50acdd102f75334ab5ce2944368bf