Merge "[SP21.1] Address comments for API council review about aosp/1172143"...
Merge "[SP21.1] Address comments for API council review about aosp/1172143" am: 5b5403fa am: b747280b am: bab77097 am: f2522125
Change-Id: I6472b6ffb7181f135be8bea7836f6917622dc064