Android CTS 8.0 Release 17 (5240539)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXGRlrAAKCRDorT+BmrEO
eHXAAJ4gQ7Hk0qX4glz1pSjJz+Ga0nJ6qwCcDhioZhMvXpykNT8O4CS+wKK1TTI=
=eov4
-----END PGP SIGNATURE-----
Merge "Update UID routing to upstream implementation." am: b072143d78 am: e3d477a8ad am: e6ccd07bf0
am: 1b32ccb031

Change-Id: Id0ab6bdb6ae2bd0ac3fd3fa569280c1de524bf50