Android Q Preview 6 (QPP6.190730.005)
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEAD

Merge in Offset multiplication overflow fix.

Change-Id: If4922eaa4af1cbfa1b4454c5aaea910324d3b85b
Signed-off-by: John Stultz <john.stultz@linaro.org>