Merge "Modem power monitor"
am: 366318b9c3

Change-Id: I85d2b97c40df223106d9a4047b3898d0db3c733e