Merge "Make libmini_keyctl_static available in recovery" am: 4bbf1c9d24

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1898853

Change-Id: I96dd0bb7b9a4eaabae7093ab9114879ba0f5bc1c