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

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

Change-Id: Ie2e6e54b0a71530d20c407bdec9ac5d03830855d