Merge "Fix a bug that may cause the ota generation fail." am: 54f24641bc

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

Change-Id: I9f74bd1fd9422116d4fe6726b4d34585c5f84cdf