Merge "Security: Add @SensitiveData annotation." am: 71eb2258bf

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1643003

Change-Id: I1f39f37e206bad8089f4280396c31a09174dda97