Merge changes from topic "update_contexthub" into sc-dev am: d3fdea5e81

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13903326

Change-Id: Ib19109b6ad7128a7b9a98bb90c8eb2325fb2bb8e