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

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

Change-Id: I38ee41647df298f11aba10d9177ae82124da1641