Merge "Merge "DO NOT MERGE. Listen to ACTION_UID_REMOVED only." am: 1bb0616c56  -s ours am: 04829c4ddd  -s ours am: 603a2174e5" into nyc-mr1-dev-plus-aosp
am: ae559dd8aa  -s ours

Change-Id: Iaea4061c34503721c09bc7d451dc12f08de9cfce