Merge "[incremental/adb] fix signature size check" am: ef73f25db6 am: fbcc431f56 am: 8a16ffc71d

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1373276

Change-Id: Ia7cbd50a4a5f23924ec98e7e9d2a56bc1211987b