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

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

Change-Id: Iaf5270f03ef6214b9d3064f19aa0219b422687c5