Merge "Add API level to comment to marshal/unmarshal." am: 963b7bbac0 am: 6f714029bb

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

Change-Id: I8e7a8590d7005c71d5beb44722c787bbed4e8ea4