Merge f4800bc from frameworks/base Issue: 11436018 Change-Id: Id74c11037cb43d01f6cd79126623c84edfc37aaf