[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 -s ours am: 2d6eaf7f -s ours am: f386f12e -s ours am: 7426a646 -s ours

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

Change-Id: I6d7ab0a1769a10f013466c6b7e68143b607ac563