tree 2bfb4e0ef1c106a0cb4ff195d27475c8dce1ec03
parent 9f0d07f548f2cb8e931896de126de9ed58c63129
parent 8b7e1af6eee7aaa676a5a40335820a8a9068802f
author Kevin Rocard <krocard@google.com> 1573236491 -0800
committer android-build-merger <android-build-merger@google.com> 1573236491 -0800

Merge changes from topic "upstream-hal-v6" am: 82d6654ade
am: 8b7e1af6ee

Change-Id: I2d0535506e3da53eb4cfd5faadcccaa9a5bb2e2c