Merge "[SP21.2] Address comments for API council review about aosp/1172143"...
Merge "[SP21.2] Address comments for API council review about aosp/1172143" am: 6719346e am: 4e52c684 am: 439aaea6 am: 58fb70b6
Change-Id: Ib142735394349ca5bdabf853408b5f4e0b6f7813