Merge sc-qpr1 to aosp-master - DO NOT MERGE

Merged-In: I90ca5ccbf686a975f479c2488ff34f82af12946a
Merged-In: I128f5ed6c1bad350ea449bba5da21123de3ea31b
Change-Id: Ib18c8042f735dceeee5e6ab9f1c963cf630913a6
tree: 8b733030eec0fae55be19a32f354751769dd0f2b
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/