Merge "Capture MSKPs from RE more reliably" into sc-dev am: 84c78d553d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14722044

Change-Id: I7a35b8bfd5a5c351f023bbbbe02dd003678cbcba