Merge "Keystore 2.0 SPI: Add forEach for int arrays to ArrayUtils" am: 47e0d9e30b am: 7afe866370

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470092

Change-Id: I410f60138361e46fe9b333da9759549efe7fbb85