Merge "setParcelable uses const ref instead of pointer" am: e42a54b177 am: 2350502a95

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1508296

Change-Id: I3cd9690dffc8636bf845c920781a840589dc374a