Merge "Listen to ACTION_UID_REMOVED only. DO NOT MERGE. am: f1da90fe04 am: b63481d64c" into nyc-mr1-dev-plus-aosp