Merge changes from topic "am-c836ea5454aa4ff5ab260f55a8924dc3" into rvc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes I52ac80f1,Iba48c173,If0a71607 am: cfc08041 am: 4c879b0f -s ours am: 9b84357e -s ours am skip reason: Change-Id I52ac80f15d8efe152dea81b75a82faa4da1b8600 with SHA-1 d5d442dd is in history
  [automerger skipped] Use shell commands instead of ITestDevice for BootImageProfile test am: a37afa40 am: 7963fc1f -s ours am: 1337df24 -s ours am skip reason: Change-Id Iba48c173bdea2d55d8f2aa7f0fa382628582fe1c with SHA-1 5c8a5051 is in history
  [automerger skipped] Make BootImageProfileTest less flaky am: 44e771cf am: b0f118c9 -s ours am: 1cd1aedd -s ours am skip reason: Change-Id If0a716075597f45e95b8357480e4b4a7c52fbb2a with SHA-1 75446bc1 is in history