[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 am: 051b47176f

Change-Id: I1aca15af8e73afd8b434b500a888503fcb090e93