Merge "DO NOT MERGE - Merge Android R QPR1"
tree: 9f953e95356a86815de212d7a26ebf5f2e20fb96
  1. framework/
  2. service/