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 am: bdf001ac
Change-Id: Ibe86e1a89ea48c1672e2d805db7955dcb0abe696