[automerger skipped] [SP21] Address comments for API council review about aosp/1172143 am: 2cb4c9359a -s ours am: 180557c20a -s ours
am skip reason: Change-Id I141393f229e772d2eb9f7c156849e379bd71b845 with SHA-1 f8660076c0 is in history
Change-Id: I47afb9f93dc191b4e04e4d5bd5ff4a1cfd566b02
This commit is contained in: