[automerger skipped] Merge "Add config to disable app tray preview in display size." am: 98a1ebedcd -s ours

am: 4e8e6c3e67

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

Diff Content Not Available