Requires frameworks/base change I04eb2245. Bug: 5380495 Change-Id: Ia9e5c25e224b38c1cdad4cd725fc425de90f8344