Merge "Merge "Add metric logs for special cases in Display and Battery page"...
Merge "Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2 am: 920924f5" into rvc-d1-dev-plus-aosp am: 6217097f
Change-Id: I71cc4c064e3731e4162855d25ced872b571d2e72