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: 5299084e am: 321061ca am: aa442981
Change-Id: I9963e847e7f34eba9eebfa7b81b6fe9ee7a635c5