Merge "Remove Dev Settings app from emulator images" into nyc-dev
am: 4f2f58791f

* commit '4f2f58791f31a66a61865e6c6095a2113609577a':
  Remove Dev Settings app from emulator images

Change-Id: I4c7e6621f647c57e43db3368cb28eb4688544263