[automerger skipped] Merge "RESTRICT AUTOMERGE: set dialog size to small devices" into pie-cts-dev am: 8489df4dcd -s ours am: 3f614a865e -s ours am: c9c04cfcea

Change-Id: I790f395ffc98c9b3ad87f4ea6884a06b12fb143c