Merge "Stop hardcoding a keypath in OTA generator" am: f1a77506eb

Original change: https://android-review.googlesource.com/c/platform/development/+/1811896

Change-Id: I1fb1e796e10ed5b31a210375c1707721735fa856