Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: 6e9db34e73  -s ours

Change-Id: Iade198360cbd966d01c327baa8bbc5c5b83b5563
tree: 37326b2457e84b95cba75144c2f592060f1428e9
  1. include/
  2. libril/
  3. librilutils/
  4. reference-ril/
  5. rild/
  6. CleanSpec.mk
  7. OWNERS