Merge "java.security.cert: update classes in java.security.cert (part 2)" am: 9484bff017 am: 47f7d8384b
am: 0ac5c50850

Change-Id: Iebb89cfa34482e3af937a6e15c97b146e875ebef