Merge changes from topics "presubmit-am-55f310f6061a4fdfa7811f47f62b8b5c", "presubmit-am-f6a0ce426c734db58ba765fa00f5f38c" into tm-dev

* changes:
  SF: Add dumpsys flags to dump displays
  SF: Clean up display lookup