Merge "[SP21] Address comments for API council review about aosp/1172143" am: 12b21035c4

Change-Id: Ief866c87b9e69b892fca435e8555080ffdad4af7