Merge "Merge "Insert security provider into the same position" into nyc-dev am: 983a632d am: dd0b1a96" into nyc-mr1-dev-plus-aosp