Merge the 2018-09-05 SPL branch from AOSP-Partner

* origin/security-aosp-nyc-mr2-release:
  Fix probable prime confidence calculations.

Change-Id: I101137a8e7db50f6aad2f773ae5ad0d0113e8438