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

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

Change-Id: Ifd7a295b7f23ef19cf7a3bdbc05cf82e29e1d5ac