Merge "Update BasicKeyStore sample for new keystore APIs. am: 6f3586bc am: 53ca307e am: 619cc1fe" into nyc-mr2-dev-plus-aosp