Merge "Add metric logs for special cases in Display and Battery page" into...
Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2 am: 920924f5 am: defd3892
Change-Id: Ib6ae8f9e79a709c50748381f4e599328df0de2f2