Merge "Fix crash in DisplayResolveInfo writeToParcel impl" into tm-dev am: 08a70e40fb am: 6c61b6a9e3 am: d7b1c860b1 am: f04a1893ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715227 Change-Id: I011c7c0a0357bf9bd90894970d3ec08d510b4e28 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: