Merge "syscalls/add_key02: update to test fix for nonempty NULL payload am: 5309e62395 am: 012beb2848  -s ours" into oc-dr1-dev-plus-aosp
am: 3608a3098d  -s ours

Change-Id: Idc44b98854fc79cefe583ed08f4accc09b0220d4