[automerger skipped] [SP21.1] Address comments for API council review about...
[automerger skipped] [SP21.1] Address comments for API council review about aosp/1172143 am: 20fd9d38 -s ours
am skip reason: Change-Id I64cf5b9c1a775200bc89d93b404d546f41d259d1 with SHA-1 97a325e8 is in history
Change-Id: I84ed81593e96c4c15f5174205126b42a9e31c82a