Merge changes from topic "presubmit-am-62752a86f22e42429ed1b2fe80913d06" into tm-mainline-prod

* changes:
  [automerge] SurfaceFlinger: Dump on layer leaks 2p: 26b98f4271
  SurfaceFlinger: Dump on layer leaks