Merge "Mark encodeSmdxSubjectAndReasonCode incompatibilities" am: 361aa888da am: 9c3c516f62

Original change: https://android-review.googlesource.com/c/platform/prebuilts/sdk/+/1437091

Change-Id: Ib5e80e5600b0ca469f25f402b7adb90eed824a0b