Change-Id: I6a4a28987902551ebf7b775705bed5a6e91f9dca
Requires change Icba2b8b2 in frameworks/base Change-Id: I9d7a4f668e3b0e721646e42fa080f201c53a7fe9