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 am: 37737516
Change-Id: If7607352a3d7441d357e8fc6b457f1546c16bd04