Merge "Merge "Fix Bundle#getParcelableArray call" into rvc-dev am: d70c7dda am: e7322068" into rvc-d1-dev-plus-aosp