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: I79c6ffa4b43546cce1719642bd276f634eec7089