Merge "Mark encodeSmdxSubjectAndReasonCode incompatibilities" am: 361aa888da am: 9c3c516f62 am: 36a5c1ef83 am: 532f2e0b98

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

Change-Id: I40cfe81c9f4550afd79d20772cdb685edae39b73