Merge changes I872e2405,Iac8c8377

* changes:
  Add a backdoor to change FrameTimeline's maxDisplayFrames
  Dumpsys for FrameTimeline