Merge "Allow charging anim logs to be enabled from adb"