From: Xin Li <delphij@google.com>
Date: Mon, 6 Aug 2018 23:52:43 +0000 (-0700)
Subject: Merge Android Pie into master
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=69c3fc690d;p=android-x86%2Fsystem-hardware-interfaces.git

Merge Android Pie into master

Bug: 112104996
Change-Id: I7a2d421f293726a9e9db797f137601d73c9223eb
---

69c3fc690d728a58e7f44c2e1933fac5e1fba89a