Merge "Add build_gki_apex_manifest." am: c6664346c0 am: 265cb56f5a

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1425238

Change-Id: I7ebed75515937e37c6531d277602ff2035715d6d