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

* commit '922a88989a190ae5eafb8548e75d6f8db6837607':

Change-Id: Ie7f654331bd9cb6fe7da758d22828716abdfd219