Merge "Merge "Change app selection policy for post-OTA verification" into nyc-dev am: 3eaf72d am: a0dabcc" into nyc-mr1-dev-plus-aosp