Merge "Track: Check buffer size of static tracks am: cf39f0e6 am: 6790e790...

Merge "Track: Check buffer size of static tracks am: cf39f0e6 am: 6790e790 am: 6235afe2  -s ours am: abbc9ab0  -s ours am: 81c98dbb  -s ours am: 3ab2ec59  -s ours am: 346941bc  -s ours am: af5d0135  -s ours am: a816170b  -s ours am: adf9f848  -s ours am: bf5cbd02  -s ours am: 036d7252  -s ours am: 5e3fb0f4  -s ours am: ec3e56c0  -s ours am: c786f7b1  -s ours am: 3c956b6c  -s ours am: 6d67fc6a  -s ours" into oc-dr1-dev-plus-aosp