Merge "Add SensitiveData annotation." am: 2ed831d0bd

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1642344

Change-Id: Ieb6eb657f8074a679e7665c957cafe14dfc4e0bf