Merge "power: Add DPF and update imminent hints to AIDL" am: a35e3bb452 am: 2756a9f508

Change-Id: I42284761a54427c947d6e3bc01617c6d993ffb39