Merge "Fix subject in self-signed certificates." am: a27ce04850 am: 19c771ec4e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I294f43561767efe4593407808f3da38df8480741