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

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

Change-Id: Ie0ab510cd1f8f3d438466d5eefa0cc5e48f84ad9