Merge "Fix subject in self-signed certificates." am: a27ce048 am: 19c771ec am: 508469a1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619939

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If94978b20c4bb2e8364021779c2808e4ef1f227d