Merge "[SP21.2] Address comments for API council review about aosp/1172143"...
Merge "[SP21.2] Address comments for API council review about aosp/1172143" into rvc-dev am: 04e10117 am: 1421e900 am: 893bbde9
Change-Id: I6532d25d603c3553faa374f1deb7dbc88b4ffd8e