[automerger skipped] Merge "Fix requests for IBootControl 1.0 when using the 1.1 HAL." am: 80c288d7b3 am: a8d3c3e9d6 am: d8ee3023dd
am: 28797bda60 -s ours
am skip reason: change_id I10587a70dca716366a5cf48c8bc8c1bc4fb9f93a with SHA1 0ede089f5b is in history

Change-Id: Ie04514ccf88ce1dcacc403ca0bab6fb42c78882a