[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 am: 149342ca -s ours
am skip reason: Change-Id I64cf5b9c1a775200bc89d93b404d546f41d259d1 with SHA-1 20fd9d38 is in history
Change-Id: I88e22156360b1937fcf4c987f6841a77a4364858