Fix warnings am: 04f10af8db am: f9ad892e9f

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/2971281

Change-Id: I9f210fbd3cbdc7ed4b51f12cfa78ef9fa9204b30
Signed-off-by: Automerger Merge Worker <[email protected]>