Merge "Add metric logs for special cases in Display and Battery page" into rvc-dev am: 1a9e99b2b1 am: 920924f5fe am: defd3892ce am: bdf001ac9c am: 0edd5b1f4f

Change-Id: I1bc5f089ec5ae55ecfda412c75212cb2394364ba