android-7.1.2_r30

initial-contribution@android.com

2d274364 · Merge cherrypicks of [2331043, 2330986, 2331024, 2331025, 2330859, 2330970,... · May 30, 2017

Android 7.1.2 Release 30 (NHG47Q)