Merge "Merge "Merge "Fix the documentation for SecurityLog.SecurityEvent.getData()." into nyc-mr1-dev am: 504ca8e4 am: 1f8f2996 am: 43c6f288" into nyc-mr2-dev-plus-aosp am: 573f0587"