[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: d52f7bbb -s ours
am skip reason: Change-Id I64cf5b9c1a775200bc89d93b404d546f41d259d1 with SHA-1 97a325e8 is in history
Change-Id: Ida7cc9c8cb72cff940d117ad697125029ad379c5