Merge "Frameworks/base: Update preloaded-classes" into nyc-dev am: ba94385e5f am: 572b0daf85
am: 609168a3d9

* commit '609168a3d98d14c452e0dcac2e323d9956c3c057':
  Frameworks/base: Update preloaded-classes

Change-Id: Ie965e86ec2dde2aa61e50433d194363f5bf2bba4