tree 9225d171a52a5d28346387c772d35d3e0d564c18
parent ea20d326d5546b5fc89b303d38acfe5b4f01bf0e
parent 430c4038afa698d528ffa483a22b760c0a1d2280
author Kevin Rocard <krocard@google.com> 1573237166 -0800
committer android-build-merger <android-build-merger@google.com> 1573237166 -0800

[automerger skipped] Merge changes from topic "upstream-hal-v6" am: 82d6654ade am: 8b7e1af6ee
am: 430c4038af -s ours
am skip reason: change_id I3347ee3aabe753d34c69dacbd707c60105d80a47 with SHA1 c5b098a76b is in history

Change-Id: I20e344d2ff8e98387fbb2aae019e43bcc8fc6c38