Merge "Frameworks/base: Update preloaded-classes" into nyc-dev
am: ba94385e5f

* commit 'ba94385e5f8af1556755a7fa5c8e9c3bcb3e5fb0':
  Frameworks/base: Update preloaded-classes

Change-Id: I2c918b2207331cad8d2904f4f314cf9490c4ccac