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