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

Change-Id: Ic4d1d7f7ce4bf8c6bf03fbe1da57216a8179bca9