Android O MR1 Preview 2 (OPP6.171019.012)
Merge "Fix dependencies of packages that target earlier releases" am: 30c85e8178
am: 577d18e542

Change-Id: I4af448217e735b18f569f1d1fd18071843b0a863