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

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

Change-Id: I56c69776387013c64c62c97e3353bf098c61214e