Merge \"Merge \\"Allow quick view package to be set via setprop.\\" into nyc-mr1-dev am: 24cea93b4a\" into nyc-mr1-dev-plus-aosp
am: 35c77908f0

Change-Id: Ib4b46c435e38caf362f91c9674766621146ac770