[automerger skipped] Merge "Merge "Clarifying meaning of items param in...

[automerger skipped] Merge "Merge "Clarifying meaning of items param in javadoc per feedback" into rvc-dev am: a493b5c5 am: 2f23e9d8 am: 1198679e" into rvc-qpr-dev-plus-aosp am: 3ca98363 -s ours
am skip reason: Change-Id Ic021f6fc37e7fce8e9b052d7434d0dc1569724ea with SHA-1 799b7deb is in history

Change-Id: I5f86886e93891555175b7527874ee61b6e227c31