Merge "Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am: f2e0a719d0 am: 56f32483b0 am: d1df52a46b am: 56f2f91793 am: 5dccdf9174" into nyc-mr1-dev-plus-aosp
am: 8d0ac33000
* commit '8d0ac3300055ac77d507c151ea7fcbc4172588e7':
Change-Id: Ide4f89f03f800d2ec9ae2589ef3475afa9617f8f
This commit is contained in: