Change-Id: Ie6ad130bd0e6daf8562c477f0297ba914d3f22d1
Requires new APIs in change I41338230 and change Icce8d6f9 from frameworks/base. Change-Id: I21b645bdc265b477453f9b177f6776e2c58bd323