Merge "Merge "adb: fix abb test." am: fc4e54ecb0 am: 6016dd02a4 am: efa13fc083 am: db8b12cd76" into rvc-qpr-dev-plus-aosp