Merge "device_drop_monitor: updated sepolicy"