Merge changes from topic "OutputConfigurationParcel" into sc-dev am: a0c39535 am: f998824e am: 4bf4a19d

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

Change-Id: Ia8fc006c1395867bbe47dc27456914a2b325c7a0