Merge QD1A.190821.011 into stage-aosp-master

Bug: 141248619
Change-Id: I93f17dc43cf21d3063ba83ac2029c92411752aef
tree: e3ba2b42462c456a67f438b44974aeaa527cf63a
  1. 29/
  2. Q/
  3. OWNERS