[automerger skipped] Merge "Add config to disable app tray preview in display size."

am: 98a1ebedcd  -s ours

Change-Id: I36fb69986ab30b14f3040de35cbd9aaa6d7969b1
This commit is contained in:
Fan Zhang
2018-09-11 13:13:33 -07:00
committed by android-build-merger

Diff Content Not Available