am c152c7aa: Merge "Revert "Frameworks/base: Update to preloaded-classes"" into lmp-dev

* commit 'c152c7aad6ece42d101aede8efe9cdb5ea3f5a3c':
  Revert "Frameworks/base: Update to preloaded-classes"