[automerger skipped] [SP21] Address comments for API council review about aosp/1172143 am: 2cb4c9359a am: 43ff860cf2 -s ours am: 5f7339c644 -s ours am: a54c216cf9 -s ours
am skip reason: Change-Id I141393f229e772d2eb9f7c156849e379bd71b845 with SHA-1 2cb4c9359a is in history
Change-Id: I9e09cf7be805757e5e76fddb7831c6f09d0c6bf7
This commit is contained in: