Merge "cmdline property in bootimg can be customized for debuggable builds"...

Merge "cmdline property in bootimg can be customized for debuggable builds" am: 4b2435bc am: 61d7bc33

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1813356

Change-Id: Id70b8646f7ab57620381c6b57f642966bc6967f2