Merge changes from topic "ks2_with_keymint" am: ab1b8a7a20 am: 2694b808b2 am: 2eb526a1ae

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

Change-Id: I50f903a11158653bf6a379d0db713cba60d8ba22