Merge "PowerManagerService: notify SurfaceFlinger on power hint am: c0201ca9...
Merge "PowerManagerService: notify SurfaceFlinger on power hint am: c0201ca9 am: f90d2321" into qt-r1-dev-plus-aosp
am: ea54218a
Change-Id: I1e342f05898f0447afde286131400e78ad0c98a1