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

* commit '572b0daf851126aceefdd3496d41e4352f13898c':
  Frameworks/base: Update preloaded-classes

Change-Id: Id211354ff06f7cd70fdcbb363c0573d004947cfc