Merge "Merge "Add "do not kill" install option" into nyc-dev am: 6958226 am: e671e2c" into nyc-mr1-dev-plus-aosp