Merge "Add build_gki_apex_manifest." am: c6664346c0

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

Change-Id: I4a1b1fa3a6ce50a89f0ce6533a56386068f5d478