Android O MR1 Preview 2 (OPP6.171019.012)
Merge "Fix dependencies of packages that target earlier releases" am: a3efe60e6b
am: 6387a14bfe

Change-Id: If0efffb57160316413ca9bf2a28e1d62f4cef972