Merge changes from topic "OutputConfigurationParcel" into sc-dev am: a0c39535 am: c7726bd3 am: 4ba46290

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

Change-Id: I6ef3f055029cb33a47fb9efbc3b7b0f9fafa5def