Merge "Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev am: 77df46efec am: 4df6466c0d" into nyc-mr1-dev-plus-aosp
am: fdbd499e24

* commit 'fdbd499e24af27f62200c8218a01cd83a5e215b8':

Change-Id: I82b180c7b873734b76a6a8f7a6692fea369518bb