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