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

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

Change-Id: I199d7223c6bf72c46a9ed09b507f71c4280b4d30