Merge "[automerger skipped] Support beta 4 system images. am: 93b2fa30 am:...
Merge "[automerger skipped] Support beta 4 system images. am: 93b2fa30 am: 69cb1f5e -s ours am skip reason: change_id Ic97d42c89ac011fa668f0edb23fbb6a13a486e57 with SHA1 eb9e6277 is in history" into qt-r1-dev-plus-aosp