Merge "Temporarily add IKE to non-updatable stubs build" am: 6869137dfa am: ddd98663b5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I223be3b1dc9a06730bb62cae0bd3355926da9265