Merge "Merge "Merge "Fix Bundle#getParcelableArray call" into rvc-dev am:...

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

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

Change-Id: I351af00101847c96e8543c815b4d88950415197c