Merge "Reserve item ids for samples + grid" into rvc-qpr-dev am: e0327643 am: a8b90d6a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12306947

Change-Id: I35d9b2a03d197a20078c78ce84d251fb07a6a05f