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

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

Change-Id: I9cdf9ba5cc6fbeb5bf80c0b2d7bbe8a5c179c9a7