Merge "Capture MSKPs from RE more reliably" into sc-dev am: 84c78d55 am: fa720726 am: c8d9730e

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

Change-Id: I51d8a1d5cc3f7c489ffb7ee50696febb6f71156b