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