Android 8.0.0 Release 36 (OPR5.170623.014)
Merge "Update UID routing to upstream implementation." am: b072143d78 am: e3d477a8ad am: e6ccd07bf0
am: 1b32ccb031

Change-Id: Id0ab6bdb6ae2bd0ac3fd3fa569280c1de524bf50