[automerger skipped] Merge "[SP21.2] Address comments for API council review...

[automerger skipped] Merge "[SP21.2] Address comments for API council review about aosp/1172143" into rvc-dev am: 04e10117 am: 1421e900 am: 893bbde9 am: bdeec79c -s ours am: 69be4349 -s ours

am skip reason: Change-Id I1d377ee277e9c21e398d7446b1db28c877cbe6b2 with SHA-1 1bdeee4e is in history

Change-Id: I58c90d6c76b1c9f171e047765a503e8736b2d850