Android 8.0.0 release 22
Merge cherrypicks of [2846958, 2847366] into oc-dr1-release

Change-Id: Ib5be897ddc095597fc05d10b1d14e1a97d674737