Android 7.1.2 Release 36 (N2G48H)
merge in nyc-mr2-release history after reset to a3e136be581ee59b78aae8165ac54aacbfbbf369