Merge changes from topic "presubmit-am-59e5bf2bc6fe4ee4a0974d57b547088e"

* changes:
  [automerge] Update preparers to align across everything 2p: 7b33aa7e3f
  Update preparers to align across everything
tree: 85182592db07fb47dfd89786812cf589b846cbae
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. CleanSpec.mk